From: Daniel Kiper <daniel.kiper@oracle.com>
Date: Wed, 7 Dec 2016 13:37:11 +0000 (+0100)
Subject: x86: allow EFI reboot method neither on non-EFI platforms...
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~3248
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=a31dc93b20bd7e351921c58fd07b3b16e2c8e83e;p=xen.git

x86: allow EFI reboot method neither on non-EFI platforms...

... nor EFI platforms with runtime services enabled.

Suggested-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c
index 7a1a73a223..55f68403f4 100644
--- a/xen/arch/x86/shutdown.c
+++ b/xen/arch/x86/shutdown.c
@@ -80,6 +80,9 @@ static void __init set_reboot_type(char *str)
             break;
         str++;
     }
+
+    if ( reboot_type == BOOT_EFI && !efi_enabled(EFI_RS) )
+        reboot_type = BOOT_INVALID;
 }
 custom_param("reboot", set_reboot_type);